Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 10 Jun 2011 23:31:05 +0000 (16:31 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 10 Jun 2011 23:31:05 +0000 (16:31 -0700)

Trivial merge